Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Oct 2011 21:29:56 +0000 (14:29 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Oct 2011 21:29:56 +0000 (14:29 -0700)
commit3f9ce2e593d7ed87f1a70f94973474b3835fc837
treee9665a4eea7e8d2b9c1826f92a150d0458ae1826
parentcb5e411532f6d58557dcd5f9208b1c16a0d1885b
parentc2c175b729b52159fc4ee77399a5cf4b741bd293
Merge from trunk.